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

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

Change-Id: I41e8dc575300c6125476632243cd868192a64ff5