[automerger skipped] Merge "Move phone ID to extra for action provision" into...

[automerger skipped] Merge "Move phone ID to extra for action provision" into rvc-qpr-dev am: 0d094ad3 -s ours

am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 7f21ec08 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I147899ccfd96a58763de3c8e9c1af6f2847da182