tree 695feeee460f8512b72d72fccad98eaa1c6096b6
parent 8cdcce294af131d268362f9b46d52d604fde911c
parent 86973d1b60b7c7e23a937bc8bb6d017555b0fd35
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579297698 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579297698 +0000

Merge "Expose TelephonyManager constants as SystemApi" am: 15720f61d9 am: 14676c2053 am: 86973d1b60

Change-Id: I7ae58e7bbd97420d91c825c92993620495b4ccfa