Merge "Snap for 15296469 from f99c02311d70f4c8619f8eb9ec633d5b4f9447dd to androidx-savedstate-release" into androidx-savedstate-release