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

Change-Id: Ieb5e44805336ded0752180118a264e4d7b6c347a