Merge "Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev am: 097514b34c am: c428170e91" into nyc-mr1-dev-plus-aosp
am: cdc2ebf668

* commit 'cdc2ebf668994eee90e996c5234c6b71e0f92af2':

Change-Id: I0be0e7d1858b239139ac1b6560df3f56b13bb2ef