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

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



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