Merge "Workaround of Slice not pinned bug when using SliceCallback" into...

Merge "Workaround of Slice not pinned bug when using SliceCallback" into rvc-dev am: c548288a am: c13f5499 am: e7a9baaf

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

Change-Id: Iceee340ef3e76aacc8a1a0f85e15f53927275e93