[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d85 am: 5d7f2425 -s ours am: d50cfa9b -s ours am: 5ff5b318 -s ours am: bd90a0d0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7b35900c07fa69407ec5bfa073a105db07e1d0a3