DO NOT MERGE Fixing the failing tests

The same fix already went into Q.

Bug: 132072038
Test: Robolectric
Change-Id: I1f6d110e36d162d157715cb6eb7c5d0661545385
2 files changed
tree: 84247df5440f296772434e97b407ff9f97f0f63d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg