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

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



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