Merge "Make aodIconTint default to white." into tm-qpr-dev am: 79089488 am: 27c9c83f

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



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