Merge "Remove dead *_device types from system sepolicy." am: ca5b01b0a6
am: 0140ae3b3d

Change-Id: Ife7480f226a725cc36dea6a538317df1e71cdd98