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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55270aa3b837bea1e2c58603b762c7f10aae052c
tree: 90754a0c30d4707393bfa7c59cbfec438ccdb4e2
  1. core/
  2. services/
  3. tests/
  4. OWNERS