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