Merge "Snap for 13942634 from 885f11c371e91999f69bfa9006cc2ddab1b08059 to androidx-heifwriter-release" into androidx-heifwriter-release