[automerger skipped] Add new DialogFragment and Controller for capability...
[automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac1 am: da1335a9 -s ours
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c70984 is in history
Change-Id: I94265a2af1e69f1257c93fb05222c79037840156