This reverts commit e17caa63. Reason for revert: rewrite this in ag/11250335 without neverallow Bug: 152655956 Change-Id: I24436720056ac1b9878e37c2ee45c5806714f3e9