[automerger skipped] Merge "Move IPlatformCompat.aidl definition to framework.jar" into stage-aosp-master am: 77a833f3e0 am: eb3326be84 am: 684082f5cc
am: 70a984cf56 -s ours
am skip reason: change_id Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f with SHA1 4985d76b11 is in history

Change-Id: Idbd92eee16cda9895f89e810b831c3f64ee240eb