Merge changes I24d94e63,I9063060c am: 1a7660b397 am: b3d080e943 am: 180b3092df

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifee243c9099daee02f8012012954a3f7ef2676b1