Merge "Ensure valid parameters for CHOOSER_ACTION events." into udc-dev am:...

Merge "Ensure valid parameters for CHOOSER_ACTION events." into udc-dev am: aefac4e0 am: a7378285 am: 1096a001 am: bf9e3f0c

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



Change-Id: I4def9e18710e7d81e1416d73154c9566fcd9700d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>