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

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

Change-Id: Ie07ede43567a978aaa018ef9a1d5f66c74baaa13