Merge "Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: should use minVol instead of hardcoding 0/1" into nougat-mr1-cts-dev am: f781ac8c4f  -s ours" into oreo-cts-dev am: c5094c93fe  -s ours" into oreo-mr1-cts-dev am: 1bea775dc0  -s ours" into pie-cts-dev am: feaf5e3809  -s ours" am: 46daf7140c  -s ours am: e25ab9188e  -s ours" into pi-dev-plus-aosp
am: 52dab69eeb  -s ours

Change-Id: Ic48cd7c611bd72a67efdca1443cd49c23dd3aa84