Merge "Remove deprecated constants in leanback." into klp-modular-dev