[automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a
am: 8eff11f477
-s ours am: 24f87e15e2
-s ours am: 37a5ccd1f0
-s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651
Change-Id: I6b77f4da1b841bf6dc0d624ce691db846f4aa340
This commit is contained in: