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

Change-Id: Ie1e93576bca1577dfa066ee049a196635054445a