Fix UI discrepencies am: 667eed8c11

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

Change-Id: I6a4ccf5892c18de4840fc0e26df1dadb26723308