Merge "Avoid incorrectly overriding while-in-use reason." into udc-dev am:...

Merge "Avoid incorrectly overriding while-in-use reason." into udc-dev am: 76039598 am: a43597c6 am: 4b717977

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



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