[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 54abe21d12 -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: I53212e8b04ccd549b798e8bc9a4c1e761851e9ce