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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev am: fb7d6f39 am: ed735030 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id032f7f8703e9091d7a634a8ef83f4a6be404d70