Merge changes I4894c2dd,Id2977f05 am: 22a54f6a5f am: 1cfbd1bce8

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

Change-Id: I47692525fcf3f4ae09edcc5a909bd533a3ec7ab3