Merge "Merge commit 'f946cd022851ff68288b9151b3524778e4449285' of sso://googleplex-android/platform/packages/apps/Car/Settings into HEAD" into tm-platform-merge