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

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

Change-Id: If97df12dff71311cebe5956755966d42c94a6196