Merge "update L photo size name with JPN_ prefix" am: 2a46c6491f am: 70100919d0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1697309

Change-Id: I0a076d4f378f6c224c74cd3ae42fb2bcd805dfbe