Merge "neverallow shell access to 'device' type"
am: 536d195469

Change-Id: Icb5b0f78d2c59b49f2160bed76323595ca630920