Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881 am: b9ed45c308

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

Change-Id: I3ab2c769b1c02e1e76195ca5519d9538e50117da