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