Merge "Add TelephonyManager test hidden API for testing" am: 5815e26b3a am: 0f61c23c26 am: f3781d192d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1496912

Change-Id: Idd4fded6705704ec7994fdc5e28c2864f2a16739