[automerger skipped] Merge "Fixes failing CTS tests for custom description in...

[automerger skipped] 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 am: 4d8f36bc -s ours

am skip reason: Merged-In I29f9bcf58462d4a570f395594ab83d94fcbaff55 with SHA-1 94596d90 is already in history

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



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