[automerger skipped] Merge SPL-2019-12-05 skipped: 551a326952

Change-Id: I46b1e14b44986e9c5edca5aa3fe806ed7721c2ca
tree: 2ceaf70da2b52f87ba7b13923c19d3bdbfc7f244
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS