Merge changes I7b88f216,I87ca34d0,I1cc4c14a am: aa677d973e am: aebcaf458d

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

Change-Id: Iba2c1be722d232820c26a0de0dd031639aa9740f