[automerger skipped] Merge "Fix the endless panel loading" into rvc-qpr-dev...

[automerger skipped] Merge "Fix the endless panel loading" into rvc-qpr-dev am: a78af692 am: c0468c48 -s ours

am skip reason: Change-Id I821faedeb62354929f3af9804cbbe44ee5bb8a53 with SHA-1 6a8d2c5e is in history

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

Change-Id: I3a3aa269c245f07717f32f99188e3bfe15888564