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

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



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