[automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 3d886d929e -s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 9272c0e3c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I5b5fcd65f51a2195b1ae91c1f746473615a1143f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: