Android O IOT Preview 6 (4475743)
DO NOT MERGE: Add default display modes
am: bd5266c50b  -s ours

Change-Id: I0cf496f2478eaf0a593529bb785c7a298a1f433b