Merge changes I0daebc18,I87df46d1 am: b438f33e52 am: 42a6861398 am: e7ddbe0b99

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

Change-Id: I544472d56b08565cb039cf1330240d8a13578313