[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 skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc40638 is in history

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

Change-Id: I07395bbd3c6d17c709d7506df657025e0306adc3