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: If33f3e00bf1e87a136120beddbc9b5d52be69a85