Merge "Added getActiveSubInfoCount" am: f74b6baf67 am: 5e4c95b734

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

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