Merge "Revert "Add permission listener tests for virtual devices"" into main