[automerger skipped] Address leftover comments of ag/18112116 am: 29b1b5beac am: 521df6a11a am: 6f5fc85d03 -s ours am: 4f9272b4c9 -s ours
am skip reason: Merged-In I0b129ec322159f608c447f608a4e11bed1971b55 with SHA-1 29b1b5beac is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18643251
Change-Id: I9b00159c42d23367bb94f691622b264affcfc7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: