Merge changes I30c813d3,Ie3eb90ad am: 9c6cc87579

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

Change-Id: Ib774256cbd5e036b7b2db4ec88fbb0b0bb1fc179