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

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



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