Merge "[Settings] Adjusts the result code to cancel when complete redaction interstitial setting" into sc-dev am: d647dece76

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

Change-Id: Ie266b69270ab3c64659ce9df4ea80a1bb0a4bc81