[automerger skipped] Merge RQ2A.210305.007 am: b446f99f5d -s ours am: 47aae1d497 -s ours

am skip reason: Change-Id I029eea0e2b226841b5204ad2f26ec7787082e732 with SHA-1 1d4e21934a is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Launcher/+/1613650

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2dccd1e21771d149c25116633fd815ad5801f17
tree: 2d066e8c99fee816713015e728a6c2841a2b7f1a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS