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: fe3c5f32 am: 5bf01054

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



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