Merge changes I4894c2dd,Id2977f05 am: 22a54f6a5f

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

Change-Id: Ie831f7fbe7e41cc71b429d3be3ce71658d0719d7