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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa6d2808483497e299ec13034e2ebd6fbbcc7522