Merge "Don\'t opt-out of warning dialog by default on user builds." into nyc-dev
am: 34510eb

* commit '34510eb2933b98f0c8c73f9a7be5eae911a14210':
  Don't opt-out of warning dialog by default on user builds.

Change-Id: I4cb37a050cbed326ca78e9d3ace672819059e825