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

[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: f9e7a172 am: be774628 -s ours am: ffce5211 -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: I3b39a70bcfde7c9187ee216eb72e5a8b77281a22