tree b5d91fcc125ce110e5ae75276ace9b9431cf85b0
parent c1f0ca3c7fc9e6f4f068f29224cfcb801f0a9bda
parent 049d0ef6a8bfeb4b88e15b7a113755eba9345c3e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1721883033 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1721883033 +0000

[automerger skipped] Merge changes from topic "nfc_aosp_main_merge" into main am: e90a4d2631 -s ours am: 049d0ef6a8 -s ours

am skip reason: Merged-In I5a55be1d3b906f8b70482869864e37958a6f27f7 with SHA-1 27145bdeb1 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3190191

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