Merge "Handle the UnsupportedOperationException when register TaskOrganizer" into rvc-dev am: 625280b87c am: a436bc516e am: c70c6ad720
Change-Id: I3823624550c0e04bf70633f02cc62b84e546d189
This commit is contained in: