Merge "Merge "Address missed comments from previous CL" into rvc-dev am:...

Merge "Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e am: d00340e1 am: 43935986" into rvc-qpr-dev-plus-aosp am: 23c9cc0c

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

Change-Id: I6fca331224199adce27ff8b835d4c54c74a112b6