Merge "Prevent NullPointerException on user update" into rvc-qpr-dev
tree: 7d403bdbaeb9d4c517f904dbe98a61a1d17d083e
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg