tree d8cfc6702e72f63487f19826697c813bd414f46b
parent 08bda28b965a92d32cc5c6ef1b61793a85c20fa5
parent c5fa4bb4c2fc8e15b7ef33bb2b86c791ec9d7e40
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1692747230 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692747230 +0000

[automerger skipped] Merge "nfc(api): Restore behavior from Android T" into main am: 1aed35da6a am: 7f33c55ad4 -s ours am: 82c4090415 -s ours am: c5fa4bb4c2 -s ours

am skip reason: Merged-In I4aaa0a87c38eaddccc566c18b75cd1acedc29d75 with SHA-1 322c9daeeb is already in history

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

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