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

Change-Id: Ib94281d5185c31f4c3bc31b21f6e7c0310829208