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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c4 am: 18895edd -s ours am: f06e1039 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I640fe0d3943583289d354b56fc5c7168eb66def4