Merge "Improve the while-in-use logic change detection logic" into udc-dev am:...

Merge "Improve the while-in-use logic change detection logic" into udc-dev am: 188de432 am: e82a5fb8

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



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