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

Change-Id: I24922b59b3dfeecd4cb4bdb423d1fde7ff814b2a