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

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

Change-Id: Ic7820917df5828360b0e372128805411766f0b18