Merge changes I6c715612,If84ff928 am: 2281985cd3

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

Change-Id: I40a4def2d931c8789f0c6993b34a6676a1d684cd