Commit 55c4cb78 authored Sep 04, 2021 by chaviw Committed by Automerger Merge Worker Sep 04, 2021

[automerger skipped] Add display proto info am: 66e11cf8 am: 896d71c7 -s ours

am skip reason: Merged-In I445a892a855c302ab617a9c79bfbf5f217ac5349 with SHA-1 0a398994 is already in history

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

Change-Id: I23b38ab44ceb9ef69e6dad5c69121eafff0886da

There are no changes