Merge changes I0daebc18,I87df46d1 am: b438f33e52

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

Change-Id: I8819578e8aa2432677cc80766dc910f775eddbe6