Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev am: d76033fd24" into qt-dev-plus-aosp
am: bef10595ef

Change-Id: Ibd27bfb518bb73718e316e5de25c87ed7cf2d278