Merge "Sync with FrameEvent.aidl change"