Merge changes If71af5f7,Ic7861ac9 am: 3ea5fd2edc am: b1dc01ec4a

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

Change-Id: I637031ab132d4aaae5a85b59886da187e64ea8ba