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

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

Change-Id: I3574947a29b618ea57033b15aa901c6a0693ac2f