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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f am: 2fe0d45a -s ours am: 86a02e1e -s ours am: 54abe21d -s ours am: c0dd58ee -s ours am: 55a37d55 -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: Ibcaa22901d70ef28982a205c6eb5c485d41cac96