Address leftover comments of ag/18112116 am: 29b1b5be am: 521df6a1

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



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