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

Merge "Merge "Revert "Workaround of Slice not pinned bug when using SliceCallback"" into rvc-dev am: 77dcc34b am: 69835161" into rvc-d1-dev-plus-aosp am: 3ae447fa

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

Change-Id: I486fbac541d9f515f131fff5af7fb65e66416e60