Merge "Add a feature flag for overwrite confirmation dialog." into arc-apps
am: 8c465e9823

Change-Id: I5adb2899e5e9cca352f68b2a6a555264d108757a