Merge changes from topic "sf_157096772" into rvc-dev am: b74fe1dc23 am: 5295364ae4

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

Change-Id: I28942e026144a3895dca34cbd6c86daa55e5710e