Merge changes I5fe33278,I6aede64e,I541f7c3e am: 286347bfd7 am: efd5e9f121 am: 5595e6b542

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

Change-Id: If6ad4b367482f5e9c3aeec2485ec34d88dd5ca48