[automerger skipped] Revert "Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7..." am: 38fa185a27 -s ours
am skip reason: skipped by user ccross Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12454361 Change-Id: I086dd5e357152e716a303c0f5eb41ca9577cc1fd
This commit is contained in: