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

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



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