Merge changes Id85ddcb6,I3b096848 am: 674d912e57 am: 4090b029d6

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

Change-Id: I9913e72005c79bb9833bf8d999f7f4023446f448