[automerger skipped] Merge Android R am: 8f243ec22d -s ours am: 3887d9704e -s ours am: fea86c9fe2 -s ours am: 40a6029a3c -s ours

am skip reason: Change-Id Idee0d7e25684262c53f897679768e753000fffab with SHA-1 632d04688e is in history

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

Change-Id: I4165d769c3ab7ec7b957fa7df6fc95b17801a803
tree: 73f9f17cd06b20900d30b446fab57811306bae63
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml