Merge "Disable the while-in-use change" into udc-dev am: c0643ead am:...

Merge "Disable the while-in-use change" into udc-dev am: c0643ead am: 76e1db06 am: 6fe142ab am: c065ea86

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



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