Merge changes Ie1fc2d92,Ie66e92cc,I09a4520a,Ia13d0dc1 am: 1bbd2eef58

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

Change-Id: I3f58f41091ae9abf9ba94f0af4df877c19d658fc