Merge "Update motion goldens along with AndroidX drop in ag/27379641" into main