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

Change-Id: Iccdb93af0b1ec642231abc6c18d0fed5018e80f8