Merge changes Ia2f891c2,Ibbe111b0 am: 53f9288870 am: fcad4767db am: a39c2da539

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

Change-Id: Ib6564c9b99215c5baf16ede2b8b67d66c4fe6046