Merge "Add Japanese Photo L size" am: d8464708f6

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

Change-Id: I9028862d97d7e9363894f5d5fb83aa54d9ca0139