Merge changes from topic "late-bonding" into udc-dev am: a0c24932

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620



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