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

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

Change-Id: Id242aa8522643332f86dfa8c1d82bbfdc31a0fdb