[automerger skipped] Merge "Modify the value of intent-filter" am: 15ecc3610d am: e7ff215244 am: 53fa14267f -s ours am: 3b71dd2042 -s ours
am skip reason: skip tag Change-Id I40dfeec1c25cd549bbe5559e3c3ce21813fbf922 with SHA-1 aaf21230a1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579989
Change-Id: Icf9680ae948b86452df4d313fd4c17acc8847917
This commit is contained in: