[automerger skipped] Merge "Add API signature files for the system server APIs" am: 159c9e52ef am: 89ed5dfc84 am: 0aec0db72f -s ours
am skip reason: Change-Id Iec8cdd30ad5e4979d56140a8c00a85af6476f67f with SHA-1 13c923d00a is in history

Change-Id: Ia760a09625c30ef8bb3a7f4db458af06d9a6f73e