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

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

Change-Id: Iba28857a715609cb332f9f50884a4de9ba81e5cb