[automerger skipped] Merge spl-2020-12-05 skipped: 62d023df13

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