Merge changes I51839f56,I821c42c3,I77ac3f77,I91afd69d am: 8b90646c99 am: 21caa80f85

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

Change-Id: I7ab765776ed4f2f700a641b1846faf44e111bd54