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

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

Change-Id: I408b6beed79bee76df8f9c84edd2bdf1401cfe32