Merge "Fix the integration issue for HAL 2.2" am: c4718b793c am: 5e070c733a am: ee5538cb27 am: dda57e13d1

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1881111

Change-Id: Idb9763abf1aa5c846cff4c109f122c040bb2988a