Merge "Add Japanese Photo L size" am: d8464708f6 am: edea4fa173

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

Change-Id: Ic5ef7bc0a8f4317fb9d4fcfe2e0c62781b39d46f