Merge SP1A.210105.001
Change-Id: I7b7b15910a40bbd93d74c4349c1741841cc7f27b
tree: 0cda4b5a2de6d23d7064eab87e662054c9226839
  1. src/
  2. Android.bp
  3. AndroidManifest.xml