Merge "[flexiglass] Addresses comments from ag/23884810" into udc-qpr-dev am:...

Merge "[flexiglass] Addresses comments from ag/23884810" into udc-qpr-dev am: 84c721e5 am: bf08232e

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



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