Merge "Allow com.android.* classes in system_service stubs" am: c26b2e8f06

Change-Id: I16055be25b2b5716ffa6c1a6cce17c923288c7c7