Merge changes I7648ff04,Ie8012b1c,I3e655277 am: b8a40de4f4 am: 17b0984538

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

Change-Id: I1dcb703b5bc4c8f10b3de9ac1263a53fd16aeaa7