Merge "Snap for 7924970 from be8a7617da8765fdcb3abe35d9f1578b1cc8d45a to androidx-preference-release" into androidx-preference-release