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

Change-Id: I8febf55cb592902699bde59d0d8be6de36030cde