[automerger skipped] Merge spl-2020-11-05 skipped: 8bf7df49a8

Change-Id: I9c402515b4ab56c25a85c47249c27bbc00b9d794
tree: 19700ac8b4d4c600e5aab2bb037b78d15fd45d57
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS