Merge "Snap for 13356059 from c38c52834304bf48f70f7fa3570d102d280ea19a to androidx-savedstate-release" into androidx-savedstate-release