Merge "Fix issues for Japan model." into android10-tests-dev am: 8ccf3e021d am: f61e8e383a

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

Change-Id: Id95af6c2b8fc3c34d750292b107f399f07a20cc1