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
Change-Id: I30ce0c2ab6caae9b08255fa9199e0fc8c1428dbb