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