Merge changes Icd00c776,I20414858 am: 3cb5663222 am: 0be835e670

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

Change-Id: Ib1dc2f81e57492aa0fd784e9a0e333fa91e40e11