[automerger skipped] Fix the disappearence of the content view Surface area am: 5093ae6f6e am: 3da88bf1c8 -s ours

am skip reason: Change-Id I0f2ede4b29cb7eca115267029e3d234c707ce97d with SHA-1 3d0fb064ba is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4077797fb0eda939e8e2e80f227cbafcbaf5a845