[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours

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

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

Change-Id: I2c70947e2cf9fe38a9560f73ecbf040e66e6c659