Merge "Address leftover comments of ag/18108411" am: 77a0e3da am: 6455bee2...

Merge "Address leftover comments of ag/18108411" am: 77a0e3da am: 6455bee2 am: 6afad808 am: e56f3081 am: a2e6ccc0

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



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