Merge commit '3bf98c54fa00af3788192a01399009c0b69dc17b' of sso://googleplex-android/platform/packages/apps/Car/Media into HEAD
Change-Id: If9712431931c53ff9a67274c543e009e2b720d9b