Merge changes If27bffb5,I945e650b am: 21fcad29cd am: bd0fef633f am: bd9607b9f1

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

Change-Id: I871b0ba8bd3c9af9c7387e640608f0544b2c24ec