Merge "Enable redaction interstitial after setting up pattern" into oc-dev am: 2fc1fa6c41
am: 0c3e38b593

Change-Id: Ibfd4234138aed95c50a32ce9120c8cf09df4d5ff