[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours am: 395ac6073c -s ours am: 374ef0012a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic8b70235b1af9ca57c9eede38fd12c250c907189