Moving private classes to innerclasses

Android studio is unable to process dagger annotations if multiple
classes are defined in a single java file at root level

Test: Verified that SystemUI builds using Android Studio
Change-Id: I748c0f3723d0bac4855806468df8e26e14f2e94f