Merge changes I24d94e63,I9063060c am: 1a7660b397

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iceaaa143392eb19e0138c9dd8b8caca9e7b6d137