Merge "VHAL: fix CTS CarPropertyManagerTest#testRegisterCallback"