Merge "Move tuner constants to Tuner.java" into rvc-dev am: db95fd7845 am: aaffb453b0 am: ecfd7ca2bb am: 94edbd1996

Change-Id: Ifdffac710049cf4be33081e54ed93c96b049edf9