Merge changes Ibdbe8161,Id2b0fc02 am: e59437a40e am: fb13cc2102 am: a9061c2486

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

Change-Id: I78bd83dc10019f08c47697d1452f1149beb6a482