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

Change-Id: I7a587eaed7e166b4f050cb7f90872685ff2f1b2b