[automerger skipped] Merge changes I82c49085,Ic2e461c1 am: cbae5189 am: 806a1d50 am: e132cc1c -s ours

am skip reason: skipped by user smoreland

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

Change-Id: I2ee1cd095cda20daa2d533b3191b996694cd3c80