[automerger skipped] Merge "EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION -> EXTRA_CHOOSER_MODIFY_SHARE_ACTION" into tm-qpr-dev am: e8544a3742 am: dae0881b9c -s ours
am skip reason: Merged-In Ida05cc4efb8d5c95ab783a7fd22a7008bf77aca2 with SHA-1 651a576c12 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21444626
Change-Id: Ie47f9432db08c7f1293ce07358ce01ffd655ded0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: