[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: 0dc45600 -s ours am: 68952164 -s ours am: 58c97c30 -s ours am: 9ae84a97 -s ours am: e14c913d -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: Iaf1797be9be1e41593b08e385ac206aef27259db