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

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



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