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

Change-Id: I193fb2a306051a686ca7699e419372c86dde3a25