Merge "Allow chooser targets to use two lines" into udc-dev am: b6db5913d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23117456

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