[automerger skipped] Merge "Allow com.android.* classes in system_service...

[automerger skipped] Merge "Allow com.android.* classes in system_service stubs" am: c26b2e8f am: 2a29a605 am: 9044a829 -s ours
am skip reason: Change-Id I8b36cf7a4ff569d0b960455de09ed40592dd5a9e with SHA-1 f74130f5 is in history

Change-Id: I41dc29843925112da3b6d405975db6cfde6a36f3