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