Merge "DO NOT MERGE Update demo mode time to 8:00 for Android 8.0"
am: afc4e370cd  -s ours

Change-Id: I3fa8d25130022abb4b5d0e39c0fc149ec2190604