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

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

Change-Id: Id2c9f020009cdab069da039575998aedd4f51628