[automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a -s ours am: 1c6594bcd4 -s ours am: 29a15a436d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136 Change-Id: Ibdc0f69ba63b9633195fc7c45e60c94924c4cdea
This commit is contained in: