Merge "Merge "Fix progressbar when orientation changes" into tm-qpr-dev am:...

Merge "Merge "Fix progressbar when orientation changes" into tm-qpr-dev am: e543602f" into tm-qpr-dev-plus-aosp am: 6a8d5332 am: 2d55867d

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



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