Fixes bug 8512972 Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
This helps reduce the pressure on framework.jar, and makes it clear that it should only be used by the system_server. Bug: 7333397 Change-Id: I0858904239535380fbf30562b793e277d8c3f054