tree 3b14b8b3e9c56cd2d7f0ccb5c3f5b9e33d701e65
parent 1799a6dccda7320d3285f5e1512d2b12e3e2df27
parent 97759f7f2a6ef052f897767c9e42ab5a457541d5
author Zoey Chen <zoeychen@google.com> 1575963537 -0800
committer android-build-merger <android-build-merger@google.com> 1575963537 -0800

[automerger skipped] Merge "[Telephony Mainline] Move carrier id proto to TelephonyProvider" am: 564d6734e5 -s ours
am: 97759f7f2a -s ours
am skip reason: change_id I4f9cf0d7d899fdfe64858d0ca19cbe350516a8fd with SHA1 7b951d5f5e is in history

Change-Id: I418360477fd370789b76f297f8fcdd15ccc21b6e