Snap for 7924970 from b4ad6ebe55e333089df61ed0ff3203e866696c31 to androidx-preference-release

Change-Id: I0f2969a5f36b2a7a681937912cbbe36975917856
tree: f043f0d35a705f3121cbd59d9a48336d8eef41ae
  1. darwin-x86/
  2. linux-x86/