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

[automerger skipped] [DO NOT MERGE] Fix the blank space on contextual card loading timeout am: 4753adfb am: cad3c395 -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: I0e0a5483008a645da1f7bfa96907381c67e2e752