Merge "Merge "Update the Aod Icon colors after the HUN->AOD transition" into udc-dev am: c1358b3c am: 30774ebb am: 95b81aed" into udc-qpr-dev-plus-aosp am: 2a05ec87

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23051397



Change-Id: I318a433a09d9cff2f9d767217b8e3f714aeb7f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>