Merge changes I8e9c5f78,If48e5ddb am: 4402c50d55 am: 011325de2b am: 43bba7a008

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5053cd275d12b6f5e102eb8220dbf7c9b8f7417f