Snap for 7924970 from 94c21950965ce4f84e6d31e0f026984278b9eeb4 to androidx-preference-release

Change-Id: I43805da8b0909c6c551c5f31a2d4f75c006af4c7