Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b am: e02dc982ff

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

Change-Id: I8c67d13c5c05dd28fb759bb4578626620474406d