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

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



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