Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into...
Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3" into oc-mr1-dev am: 93111a97" into oc-mr1-dev-plus-aosp
am: f0747920
Change-Id: If2095bfcc7408c9ccbe5384f001339a84766d932