[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: aed1ab9e45
-s ours am: 00e38c59cc
-s ours am: c3531fb273
-s ours am: 0439d3baca
-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: Ia273163a401f01a21b75e628062d6d89330a79f5
This commit is contained in: