Merge changes Icd00c776,I20414858 am: 3cb5663222

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

Change-Id: Ie3272cebcfadc38d0e7bb4e26ad5ad6f6e8a60b9