Merge "Add comment to AndroidManifest" into sc-dev am: 3bd14d2433 am: 86928d4f6a

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

Change-Id: Ic16163c62a2d6d48cb16399941067a4c34e8365a