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

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

Change-Id: I4876e082bff8a3aae38ca5ad150cd3027ce2de61