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

Change-Id: I0b73d646e05ec3c0465a5865696528c05b3721c5