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

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

Change-Id: Ie13c72ea8c23779a0348c071be8c509e0379ed32