Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl..."" into rvc-dev am: 15a62def am: 753eb655 am: f65b4b76

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

Change-Id: I8536cf70ca445de7bfbc2b94e4668a56c7f59255