Merge changes I6e236efc,I4e333f34,I061a6986 into sc-dev am: e28d8aba51

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a402a4072ab3406c41514761f8d2a2c0331ec68