tree 352957a2dc02effcdf7fe88eb035843365ea34c0
parent 1679c6497b40162e8f5b065d7b1e77622e29d54e
parent 1054427c0c46876c1792132a53f6da25a00a66b9
author Shuo Qian <shuoq@google.com> 1543856424 -0800
committer android-build-merger <android-build-merger@google.com> 1543856424 -0800

[automerger skipped] Merge "Remove static for getSubscriptionIds" am: 9a9dbf05e0 am: 0be2ef9746
am: 1054427c0c  -s ours

Change-Id: I36287ce078a9fe4ff58380650019e062a4b14ce7