Merge "nfc(api): Restore behavior from Android T (follow-up)" into main