Merge "Add config to skip showing CF fail-to-disable dialog"
am: d32138d78a

Change-Id: I0bb3388b4f2e0243049316c3548aacf6f034ffd2