Merge "Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d am:...

Merge "Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d am: 6eca50dd am: 981d30f4" into rvc-qpr-dev-plus-aosp am: a3e8536c

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

Change-Id: I59236c16b832f951666fba602199b0f60f9d9cde