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