Merge changes Ia2f891c2,Ibbe111b0 am: 53f9288870 am: fcad4767db am: a39c2da539 am: 79642dd98b am: 824a156a78

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

Change-Id: Ied921f201ba8f6602cad78f16c1b7ff8c7b0d695