Merge "Fix TestUnfoldProgressListener when there are no progress" into tm-qpr-dev am: 73359104

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



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