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

[automerger skipped] Merge "Move phone ID to extra for action provision" am: fee0474f am: aa95da1e am: 1df823aa -s ours

am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 48eec197 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f0e1c00d00155641e8fdfde250787421dafa6b5