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

Merge changes from topic "late-bonding" into udc-dev am: a0c24932 am: 039fd6ad am: bd34c8c1 am: 8be19235

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



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