Merge "Revert "Revert "Workaround of Slice not pinned bug when using Sl...""...

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

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

Change-Id: I360861641cfd2a9b71a3f42419129a08b3a64641