tree ac7ddb8da4ddeebddb70183d51a6587f0f71f1e8
parent 6b8daf74e0b4a1c9d8fc629789eb31e20676f7fe
parent e428260b85e7b2508d12743874996511fa6eb98b
author Calvin Pan <calvinpan@google.com> 1541804057 -0800
committer android-build-merger <android-build-merger@google.com> 1541804057 -0800

[automerger skipped] Merge "Add CarrierId column in TelephonyProvider" am: c0e0ea3de4 am: f109c82ec6
am: e428260b85  -s ours

Change-Id: Id712aa1bfa141f6d185e1f62650fe19289832547