[automerger skipped] Merge "[DO NOT MERGE] Fix the blank space on contextual...

[automerger skipped] Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev am: e8b34c64 am: 21b7365c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604

Change-Id: I246af174a27b666b28cfa60c80bed4df149be22c