Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e84 am: 9529f00aa7 am: d0ff4b14c9 am: 691a2f487e am: 75301c4bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11978216 Change-Id: Icdce16112f4bacfcf886fe295611d07962bffec1
This commit is contained in: