[automerger skipped] Merge "Add READ_PRIVILEGED_PHONE_STATE to TestApi" am:...

[automerger skipped] Merge "Add READ_PRIVILEGED_PHONE_STATE to TestApi" am: d70fa418 am: 8c9d627f am: 70c45b45 am: 4ded5d51 -s ours

am skip reason: Change-Id I67520ba9f8bf25b759f6552a332bdebf67f4c7e6 with SHA-1 ca12f926 is in history

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

Change-Id: Ida0a4a604b212d12fe02aa2c9c0f9c8a8d8d43f9