[automerger skipped] Merge "Move phone ID to extra for action provision" am: 9d7a954112 am: 1fb857898b am: 625a058884 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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