[automerger skipped] Merge "Rollback SystemApis for Mainline" am: 127fd8d6...

[automerger skipped] Merge "Rollback SystemApis for Mainline" am: 127fd8d6 am: 1285a78e -s ours am: 0678b73e -s ours am: 95eecaa8 -s ours am: ab23d5de -s ours

am skip reason: Change-Id Ief11f574482461a4cda1b4e59cd23aaa0b8b9eef with SHA-1 d2412e3b is in history

Change-Id: Iae400fc33d9296d22deae68825d791086841098f