Merge "Make aodIconTint default to white." into tm-qpr-dev am: 7908948853

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

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