Merge "Add config to skip showing CF fail-to-disable dialog" am: d32138d78a am: a0df3496d3 am: 4025ccb0a1
am: 2cdc98d7a6

Change-Id: I0924e5bf275376f28ad94f2749d35357a4e618db