Merge "Fix potential IllegalArgumentException from the auto-select flow." into...

Merge "Fix potential IllegalArgumentException from the auto-select flow." into udc-dev am: 1b1fe073 am: 4711e5f3 am: 6d6440c1 am: e4b6973d

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



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