tree 713fb1c7b24c56f9b4045c66e7d660c4360d5769
parent 1a0d924b1766c6d16bead95104069f554f9a2e8a
parent 0793bb709a812aed1bf59a18351f803b6f1a2763
author Connor O'Brien <connoro@google.com> 1643671578 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643671578 +0000

Merge changes Ide638de1,I11bc5cc6 am: 0793bb709a

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

Change-Id: Ib33c677645367b6fa8cde498b0599081bd09ab03