Merge changes I6c715612,If84ff928 am: 2281985cd3 am: e5ab8b3709 am: 17078c14b9

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

Change-Id: Ib94c51b4341379912e99cd5d96b741a9cc49f350