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

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



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