tree faab28b70580227556fe746fb8feedef3e690245
parent 59e069bbde22ea703b14c9e703ddd2f66353e1f1
parent 9d7a954112299e324a93c381ccadac4c77743286
author Sarah Chin <sarahchin@google.com> 1608187457 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608187457 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd950c7615945334cbf932beed42d20c41e968c3