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

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

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