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

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

Change-Id: Id294d2edc0f8d84a65f1a47318c2a23a75d87fd9