[automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours am: 2ec09ea15b -s ours am: ec46592a67 -s ours am: 82b1eb23c2 -s ours
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 149a1cefe3 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953
Change-Id: I8ce2b38b991e3a6fcc7966275169ab7d5aef9c35
This commit is contained in: