[automerger skipped] Address leftover comments of ag/18108411 am: 63b2a309...

[automerger skipped] Address leftover comments of ag/18108411 am: 63b2a309 -s ours am: 91e8ee82 -s ours am: a32c4e5e -s ours am: e75b1cd1 -s ours

am skip reason: Merged-In Iade04ede17b9371e530556acb2bd84c4b57c1581 with SHA-1 a0cb82f7 is already in history

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



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