[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: 24d844a02c
-s ours am: 688eccdf1f
-s ours am: 93ff6ee02d
-s ours am: 5b1aa5ba0e
-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: I256f75c787656db0a47eca9a05350591b12ff7a7
This commit is contained in: