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

Change-Id: I6e1a7130d63ff1729a2415cf4a25b0520f33d42f