Merge "Fix issues for Japan model. am: c1e9656422 am: 4597fcc545 am: d1a977b771 am: 6e8a31191a am: dc8403be7a am: 4961b292ac am: 4a629ec19b" into rvc-qpr-dev-plus-aosp am: 6088b18b7b

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

Change-Id: I11075fde0a502ceadd898aa11c8789d37f20417f