Merge commit 'ba41b7de01a99a35c2aefb6090d5ff7c6f6cc6e5' of sso://googleplex-android/platform/packages/apps/Car/systemlibs into HEAD
Change-Id: Ifce60518259bc7cfab15a5666f216c9c7d543704