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 am: f0a5b202

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



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