Merge "Change priority of call states in determining audio focus state." into nyc-dev