Merge changes If3b52582,I97a24b74 into rvc-dev am: 3c17badba9 am: 9e182ed43b am: 2dcdc10924

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

Change-Id: I461a1ee32b7c949c362a6fb459667ab020e9e76e