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

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



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