tree 02a05c2a76dd377bb06b55fe79de3e02db246719
parent df3f66022bb61e878529f30a5d63f67e4ae3403d
parent 7fe26c8ce4058ddf491c0f075be0366772804dab
author Hall Liu <hallliu@google.com> 1531786822 -0700
committer android-build-merger <android-build-merger@google.com> 1531786822 -0700

[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo constructor""" am: ff93379e67  -s ours
am: 7fe26c8ce4  -s ours

Change-Id: If691a66bee0ed00daf3965274c1ad63bf9c37703