[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar" am: 1261967c52 -s ours am: 1d57038e6d -s ours am: 59e7925cc1 -s ours am: 485038465a -s ours
am: 80953c5574 -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1 4985d76b11 is in history

Change-Id: Ibb9f276b988d3a412e9f323e0cfa5c8df55b91a0