[automerger skipped] Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev am: e8b34c64f4 am: 21b7365c8f -s ours am: c39bf6fd64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604 Change-Id: Id8cf26b9e7951152905efcbd80113c5a78834b8f
This commit is contained in: