Merge "Fix bug in car-compat-message-notification criteria" into pi-car-dev
am: a4f2d11766

Change-Id: Ic5757cb7d7bab5900a539f21504e8b6a06e46d76