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

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



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