[automerger skipped] Merge "Add TelephonyManager test hidden API for testing" am: 5815e26b3a am: 0f61c23c26 am: f3781d192d am: 44cf382934 -s ours
am skip reason: Change-Id I30a5b695770509dc803ab5623c75e653d40f4d11 with SHA-1 53cfc4a894 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496912
Change-Id: Id23193c5428ddc0d9689274540364008662d2ee8
This commit is contained in: