Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e84 am: d00340e1a5 am: 439359869f

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

Change-Id: Ice21ea4808754a69d0c233d2c85669ff2460d2a0