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

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

Change-Id: I7eb9a2db15d800908fb965ed70e52f7f8f7febb5