Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e am: 9529f00a am: d0ff4b14 am: 691a2f48

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

Change-Id: Id21a6b49fd0a63bc40e90730486c33d52af42ced