Merge "Merge "Avoid incorrectly overriding while-in-use reason." into udc-dev am: 76039598 am: 3dcb6659" into udc-d1-dev-plus-aosp am: 1a9d19ff

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



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