[automerger skipped] Address leftover comments of ag/18112116 am: 29b1b5be am: fb6bc52d -s ours

am skip reason: Merged-In I0b129ec322159f608c447f608a4e11bed1971b55 with SHA-1 5226b1f4 is already in history

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



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