Merge "Add getDescendants to Settings Slice Provider" into pi-dev
am: 1257466d0b

Change-Id: I5c3c1fa93beb2654f56777ff1f4e0a0c35d27f6b