Merge cherrypicks of ['googleplex-android-review.googlesource.com/22652469'] into tm-qpr3-release.

Change-Id: I5e493102d4b5ab56fe2567bb1ee55eaa32416f68
diff --git a/current/aaos-libs/car-apps-common.aar b/current/aaos-libs/car-apps-common.aar
index 00f8a7a..fbfc346 100644
--- a/current/aaos-libs/car-apps-common.aar
+++ b/current/aaos-libs/car-apps-common.aar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib-no-overlayable.aar b/current/aaos-libs/car-ui-lib-no-overlayable.aar
index 5333f69..7fd5966 100644
--- a/current/aaos-libs/car-ui-lib-no-overlayable.aar
+++ b/current/aaos-libs/car-ui-lib-no-overlayable.aar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib-oem-apis.jar b/current/aaos-libs/car-ui-lib-oem-apis.jar
index 6e9d1b8..b89f646 100644
--- a/current/aaos-libs/car-ui-lib-oem-apis.jar
+++ b/current/aaos-libs/car-ui-lib-oem-apis.jar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib-testing-support.aar b/current/aaos-libs/car-ui-lib-testing-support.aar
index 726710d..dca8a16 100644
--- a/current/aaos-libs/car-ui-lib-testing-support.aar
+++ b/current/aaos-libs/car-ui-lib-testing-support.aar
Binary files differ
diff --git a/current/aaos-libs/car-ui-lib.aar b/current/aaos-libs/car-ui-lib.aar
index a3e3506..3897481 100644
--- a/current/aaos-libs/car-ui-lib.aar
+++ b/current/aaos-libs/car-ui-lib.aar
Binary files differ