Merge "Don't setDeviceEntryIntent on AOD" into sc-dev