[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours am: 5922df7f44
-s ours am: 9923ea26ef
-s ours am: e4d6c530c5
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167 Change-Id: I3ed8121a193541e17cf477ba2f53a6d3a53a0dbd
This commit is contained in: