[automerger skipped] Merge "Mark TelecomManager#isRinging as a TestApi" am:...

[automerger skipped] Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091ace am: 1ab98f18 am: 3293dd1e am: 2d0fdbdd am: 75d8c3aa -s ours

am skip reason: Change-Id I048960feb97cd6cf081056ee649e7ea8dacdc8e3 with SHA-1 88a0994a is in history

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

Change-Id: I2ec28b022da4a8bf415d8f63260e540c1dde5113