Merge cherrypicks of [16177015] into sc-qpr1-release. am: ff38664a6e

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

Change-Id: Id46fdd4db4dbf5015be46175e126d6e80d40d772