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

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



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