Merge "VHAL: fix CTS CarPropertyManagerTest#testRegisterCallback" am: 24148274cd am: 95568fb9a7

Change-Id: I22d6b74f4e587717ca8164d23d43c4a43b730668