Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa am: 1ab98f185e

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

Change-Id: Ic643ef7b31f62a6771c1f1ba5aa0e4c0a16e7e0c