[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a am: 2aba7f04 -s ours am: 692b75c3 -s ours am: 3da80822 -s ours

am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3 is in history

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

Change-Id: Iea01c8158e2d2f7025d0d1ce1a0bf463b47b4f7f