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

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

Change-Id: I961144c07d69f5fc13dcc957bd687c148834a105