Merge changes Idf197043,Iafb61b9e am: 50861777d5 am: 74bc76fa1f

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

Change-Id: I0538bf05e9842b79c5f041dde033d74eb3151c94