[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 4cee1655 -s ours am: e161ec59 -s ours am: adf31387 -s ours

am skip reason: Change-Id I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d with SHA-1 064ba89f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12803341

Change-Id: I2a4a345f08f2b3423bbb9f1d9b0de95e0a994bfb