[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 7d8c6f0085 -s ours am: 47d7fec176 -s ours

am skip reason: Merged-In I80e6c75f4d3d5f6329769444a7f0abce1d725773 with SHA-1 789e43ac8b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Messenger/+/15571671

Change-Id: Ie7bbaba790531fb257bb790663bba9b302e977da
tree: abe9c36eb63a4fcc07540fa5fff0550437b3c0e6
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg