[automerger skipped] Merge "Enable compat checking & lint for system_services...

[automerger skipped] Merge "Enable compat checking & lint for system_services api" am: b14743ce am: 34aaecf4 am: 90598288 -s ours
am skip reason: Change-Id Ib4cbc84ac9a826f7b947c951c94f8f5578f4554d with SHA-1 daa9d884 is in history

Change-Id: Ibb5f2c494b75285fc17653b94189bac1fe8897f1