Merge "Fix ExpandableListActivityTest#testSelect failed" into pie-cts-dev