Merge changes Ie04465ce,I29bbbd27 am: 78a58c8af4 am: 1113ac8ad5 am: fd1bb0ccd7

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

Change-Id: I7af154aff5ff6b638075b37a207a8dddf0ecabb1