Merge changes Ie1fc2d92,Ie66e92cc,I09a4520a,Ia13d0dc1 am: 1bbd2eef58 am: 0c008e79c1 am: 7bae0b3297 am: 1e08a170d0

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

Change-Id: I13e0b8f28f8aac3f67583afffd5ecf925bc8999b