DO NOT MERGE - Merge ab/7272582 am: 3d5b8044f4

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

Change-Id: Icb4677f96460009b15e2ac93f05f357b37dc664e