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

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



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