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