Merge "Fixes failing CTS tests for custom description in save dialog. Screenshots showing no changes from before: http://shortn/_n52tNerWx6" into udc-qpr-dev am: 31000f26

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



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