Merge changes Id8fc889f,I2145ad0e am: 5426122b9b am: 08cb54f49d am: da55afdbd4 am: 758f004049

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

Change-Id: I65c765ce5f35b699aefae38b01621006c4b33ce4