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

Change-Id: Ib37e2e8f49b8a1253248bacde60b29269e14c681