Merge "Add ability to disable conference event package handling from command line." am: b19d68f23c
am: 7be590e79b

Change-Id: I287db4411d4c485a95afca08be8b6d65ce2881b8