[automerger skipped] Merge "Added getActiveSubInfoCount" am: f74b6baf am:...

[automerger skipped] Merge "Added getActiveSubInfoCount" am: f74b6baf am: 5e4c95b7 am: f7305e76 -s ours am: 363f8dda -s ours

am skip reason: Merged-In Ie5c929fa7efe24d85385b6939a204d90d76d6b34 with SHA-1 85f02b26 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2480975



Change-Id: Id2a75d5c7368caee296937bec3b936863e8a1b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>