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