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

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

Change-Id: I7b711a4c447cc8655cfc56c3b09aa2a59221133d