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

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

Change-Id: I44b45f4edd492e5b3664205caa52ff1d7d399b8a