More SecurityManager cleanup.

Bug: 2585285
Change-Id: Ib9c5fdadc1361d67227b6f82a774b76c53840ff0
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.