[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours am: 3da8082299 -s ours am: 3adb69ca05 -s ours am: f336c3d93c -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: Ic613082d649ef4de9785d06b585a4aa8cd51db06
This commit is contained in: