Merge "Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e84 am: d00340e1a5 am: 439359869f" into rvc-qpr-dev-plus-aosp am: 23c9cc0cb7

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

Change-Id: I6fca331224199adce27ff8b835d4c54c74a112b6