[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90 am: 2fe0d45ab8 -s ours am: 86a02e1e8e -s ours am: 0dc4560066 -s ours am: 68952164ad -s ours am: 42e43abc0b -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: Ifd4ad114b0b90dcd5202d8643fb5d8535da5bb4c
This commit is contained in: