Merge "Fix IllegalArgumentException from RecyclerView in PanelFragment" into tm-qpr-dev am: 0b0d8ace66

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

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