Merge changes from topic "detach_cut" into udc-dev am: 8bcb06a1 am: 1182199a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22536415



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