Merge changes from topic "Fix ignored tests in WifiDetailPreferenceController2Test" into rvc-dev am: e4b0989766
am: f47f38c9a2
am: 6799768b24
am: 30966bffbc
Change-Id: I79d74a0a2ce91b6189950333c85e0c7b631b46c0
This commit is contained in: