Merge cherrypicks of [12952231, 12952640, 12952469, 12952586, 12952232, 12952587, 12952588, 12952589, 12952107, 12952470, 12952641] into rvc-qpr1-release am: 9243c1057f

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

Change-Id: Ia64448cbb7df499fce387c5b82c55fde50c66801