Merge "add large format media sizes" am: 62bc98dd54 am: 33cc3922c1

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

Change-Id: Ib29f14dcaf094f12f957d950a382d5b8a232ada5