Code cleanup that had not been propagated to master.

Bug: 139534680
Test: Manual, robolectric
Change-Id: Iee9f0a98b4a546039d6a9b82b4e458377fc64831
2 files changed
tree: da1e05453bb1f56d7b03d3209162ef731b02b2b4
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg