Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
am: 12d9e009a6
am: c3b6944712
Change-Id: I15299b488f8b7b066e51127ec2eff00b830d321d
This commit is contained in: