[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar" am: 1261967c -s ours
am: 1d57038e -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1 fee45aa4 is in history
Change-Id: I6d9f1abf1f0f9c77d64614f8bb2cb5e193d5f8a1