[automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am:...

[automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff am: 8eff11f4 -s ours am: 24f87e15 -s ours am: b1119ffc -s ours am: 0ae43531 -s ours am: 2d1e24e4 -s ours am: c4681051 -s ours am: 307427d8 -s ours

am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870 is already in history

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

Change-Id: I68bf4f5c740b654a38448bad7fafaa65a48930e3