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

Change-Id: I45de4ccfc1807dc4fe1dd657ce565f5d5c790598