Commit 011325de authored Feb 10, 2021 by Hamzeh Zawawy Committed by Automerger Merge Worker Feb 10, 2021

Merge changes I8e9c5f78,If48e5ddb am: 4402c50d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b115ec917ec8f244380eb2c3b2019cd5793f511

There are no changes