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

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

Change-Id: I796600abd2a314088681169a593d84aaaf92583c