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

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

Change-Id: I6d3aa61aed9db2b170ddf109bdcf63ec1c02a8f0