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

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

Change-Id: I3314ae4b03de074884f15824905258d9ab7a6476