Merge "Move phone ID to extra for action provision" am: 9d7a954112 am: 1fb857898b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0aaf794caca7c3be0731a2ed7774ec181ffd108a
tree: faab28b70580227556fe746fb8feedef3e690245
  1. core/
  2. services/
  3. tests/
  4. OWNERS