Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev am: 9e263e64 am: 20dbe919

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



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