Merge changes I896e0bc8,I27231c4f am: 00a2b1f497 am: 93169e309f

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

Change-Id: I2f5d85224e582b20bafc62f5108ec239dffcb9ad