Merge changes If7bbb5d5,I2174c17f am: 040a18c6ea am: fb83c78a7d am: d2433118bb

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

Change-Id: I9d7565b56b64769ee0114abe8f17114e14632aa0