[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ec20354f8e -s ours am: 2ce25cb3fa -s ours

am skip reason: Merged-In I4d37c5762a0589edecf5880b6b325746481efd31 with SHA-1 e0c97de174 is already in history

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

Change-Id: I7b952cbcb12db928bd5249faea43e2357b35a4b8
tree: 8d6544b8fab60721c8b4a6dba67def484d3bc297
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml