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

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



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