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" into rvc-d1-dev-plus-aosp am: 19eb76b9

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

Change-Id: I77ae91410296bda2c67b45c0083f7d55d8b40255