Merge changes I6c715612,If84ff928 am: 2281985cd3 am: e5ab8b3709 am: 17078c14b9 am: 92ffb4885f am: 6a5f9645fa am: 04d4047f02

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

Change-Id: I1f4269c79aa00345b88c8afd3165fa0995b2b998