Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a8 am: b9ed45c3 am: cbd31021 am: 2e032de2

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

Change-Id: Id79cab062cb913cbc7c138c3fca34b62b5b463f4