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

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



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