Merge changes from topic "detach_cut" into udc-dev am: 8bcb06a1 am: 1a3743ee am: baaf25db

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



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