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

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

Change-Id: I521cc90c8e193d7d41f5c50f229c86097c8eef6f