[automerger skipped] DO NOT MERGE Ensure that dialog fragment knows target fragment am: bff2057623 -s ours
am: 6b8857ba5a

Change-Id: Iddeac478daec7cf407198e483cd1edd4d48040f7