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

Change-Id: I059cb9320f315c55954303c0aee8ed4f753cc7cc