Merge changes Ie0e5ffe3,I9c73b433 into sc-v2-dev am: ee34178ce7

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

Change-Id: Iea71f792b51da50de2aff2b6f2ad5f3b669bd2c6