Merge changes from topic "detach_cut" into udc-dev am: 8bcb06a1 am: b59877b4 am: 88a3fecd

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



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