Merge branch 'pie-gsi' of https://android.googlesource.com/platform//packages/apps/Settings into HEAD

Change-Id: Id55a456ec4ae12a2db7f98889b55ed283878f2cb