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

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

Change-Id: Iad5734eca55e4a393c4d1d299787ad20f91532bc