Merge "Merge "Fix build file such that CarSystemUi can be easily extended" into qt-qpr1-dev am: c2327e547b" into qt-qpr1-dev-plus-aosp
am: 218caf810a

Change-Id: I5dd429adc1c120a98c38c9639012a2fa4479216c