Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: I90a80607c7d7aeb929fcde7bc8febbf7f3f42f09
Change-Id: If8a0936f329bf5ea357e7fbff50132b0d4389218
tree: f262a970b2b3dad07cd3215cdfab709c2f2a2ac1
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml