tree b073604dcb63b1cf7bb236673c241f36171a20ec
parent 29ce70c424da65c4680311650e6acfd9b273c321
parent 55e0fc887fd746b518c4c2d45fd43445c3582c4a
author Yueming Wang <yuemingw@google.com> 1531509054 -0700
committer android-build-merger <android-build-merger@google.com> 1531509054 -0700

[automerger skipped] Merge "Revert "Update SubscriptionInfo constructor""
am: 55e0fc887f  -s ours

Change-Id: Ib6287ee35e2ec1c2d64a067e1e136e18c27eb777