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

Change-Id: I62d379c7561aff9e3c7bd0cd42c04c99de02babb