Fix issues for Japan model. am: c1e9656422 am: 4597fcc545 am: d1a977b771 am: 6e8a31191a am: dc8403be7a

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

Change-Id: Id148d91a9f7d6a61be1b2219abf7972cc7f79349