Merge changes If7bbb5d5,I2174c17f am: 040a18c6ea

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

Change-Id: Ie9067fc20d59ffbcdbfcca371ff8fde2b9431166