Merge "Finish activity when created by documents provider and documents...
Merge "Finish activity when created by documents provider and documents provider gone." into rvc-dev am: c4609477 am: 5fb252d0 am: c256bf84 am: 1397019c
Change-Id: Ie331cd08895549b68cea09907e60c40828824931