tree 67bccf588483a78f628837f9edaa1883328f6165
parent 1396c0866035a86c06ff43b38020ced22c672174
parent 4190b87df6820c90330628d7252fda2c1db904fa
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1540421607 -0700
committer android-build-merger <android-build-merger@google.com> 1540421607 -0700

Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b
am: 4190b87df6

Change-Id: Ic83970e95380071b1f3c1aa0be2fda49889776f6