Merge changes I30c813d3,Ie3eb90ad am: 9c6cc87579 am: 775fe1222d

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

Change-Id: I0792ffd92fc97f2719272de3456dbcf4224f839d