[automerger skipped] Specify model name am: 4aeef8c4ed am: c87962696b -s ours

am skip reason: Merged-In Ida4c3a8398a838c7feb2ebd13e8c9994bea5062c with SHA-1 11acb7381c is already in history

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

Change-Id: I59030a4e34e77b27bc05d42f0fc8799826905ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>