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

Change-Id: I27c3b56a16e6d62f7b44b355172785cd70d67aa0