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: ee152831 am: 42acba96 am: 397db79c

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



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