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

Change-Id: I4c60e027443da88e618003e9e8a184af893e7230