Merge "Disable caching during HeadsetPhoneStateTest" into rvc-dev am: 811aa5a1dc am: feb34deea2

Change-Id: I7ec3c28d5181f954a7c760d87a31f7d629fc5756