Merge "Separate brightness-specific ProgressDrawable logic." into tm-qpr-dev am: cbe40d9f49 am: d2f540166e

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

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