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

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

Change-Id: I66e97aaeeb99865e268aaf72582f0d575dbfab22