[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c4 -s ours am: 8c636a5c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6df64e1d195771a60ef0dfd38a36e437bbf1c9b6