Merge "Support VHAL 2.1 in Car Service"