[automerger skipped] Merge SPL-2020-03-05 Change-Id: I9d7f6de2be0646c76f05c5042efd83b775353e7f skipped: 426324a34c

Change-Id: I50a9108a2465b14e7856950f2382717e9bb08760
tree: 03f01e466386e5a986bfa5e7c4332751e5423aa5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS