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: 22f5df57 am: 0a54dad4
Change-Id: Ie2aba6bb08bf6c65e5ef0561a9fead70a890a592