Merge "Enable to access the set_event interface on userdebug"
am: 54636483b2

Change-Id: I8aba47d5a73bd721bd4e4f8397369bac78c71d5a