[automerger skipped] Merge "Make SubscriptionManager.getSlotIndex public" am: 719310cd2c am: a781751b32

am: 59c8b87ad4  -s ours

Change-Id: I8db95a7b701c71caffc78f03ca618036c84cdf5f
This commit is contained in:
Shuo Qian
2018-10-16 18:22:43 -07:00
committed by android-build-merger

Diff Content Not Available