[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03 am: 0fe85baf -s ours am: 9ccd76cb -s ours am: 9e73b1e4 -s ours am: 1dbd53eb -s ours am: dd8e5d9f -s ours am: 7811b584 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I56f1a4c2e6156dabef7d1487b10e174c44e66b30