Merge "Added getActiveSubInfoCount" am: f74b6baf67

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

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