[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a
am: da1335a9f4
-s ours am: 5ef4a92dd0
-s ours
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a
is in history
Change-Id: I5ba07f1336bd4d4c5c9af6af38df350752667f55
This commit is contained in: