Merge "Don't put android.os.Parcelable in framework.aidl"
am: 0872f6d5e3

Change-Id: I3f6344774b44b43e2ec18f56c0a49fffc58a8629