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
am: 61fbefbbab  -s ours

Change-Id: I56c6857f42bbb8e950805633f599b138f7b8ca08