am 7afd9102: Merge "Move ProximityInfo::calculateSweetSpotType right after...
am 7afd9102: Merge "Move ProximityInfo::calculateSweetSpotType right after ProximityInfo::setInputParams"
* commit '7afd9102':
Move ProximityInfo::calculateSweetSpotType right after ProximityInfo::setInputParams