Merge changes Id8fc889f,I2145ad0e am: 5426122b9b

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

Change-Id: I57ea752df62871ae400cc18ba3bbc03a67fabbd3