Merge changes Idf197043,Iafb61b9e am: 50861777d5

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

Change-Id: Ibbf7c4622d654e53997efe53bbe7a29522fc2365