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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied46e9cb238e882ee8b77342254f19e4beacdea9