Merge changes Ib7a08010,Idd72b82e into sc-qpr1-dev am: 0cb6215dd6

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

Change-Id: I0da50b7e2f68474d70ee3ea96f5ca130ff301497