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

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

Change-Id: I2be3b6011f74dbe7fdb2d4ada0bf9537fd13c7e7