Merge "Disable SetupRedactionInterstitial when complete" into oc-dev
am: 3265c25861

Change-Id: I0a9554576451b4f217fe8180ffe6812c9b4ac7c4