Fix an NPE

Also opportunistically remove similar useless calls

Bug: 157433005
Test: manual
Change-Id: I818bce247dd9d59405d3cdae25e69ce7e6c61ba6
Merged-In: I818bce247dd9d59405d3cdae25e69ce7e6c61ba6
(cherry picked from commit 30379cd5f95b96b5cd909df73d315576d8850f76)
1 file changed
tree: 564647612f8c22a88f26d9d975e95521834ca0ba
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. PREUPLOAD.cfg