Clean up ArrayAdapter lint warnings and annotations

Refactoring only, no code changes.

Change-Id: Ia384a6597c9af84d23aed481f84d67ae817b4ac7
1 file changed