Include megapixel rating along w/ dimension.

Also, send width and height through localized strings in case some locals deal with dimensions differently.
Also add a teensy bit of padding at end of row keys. If a key wraps it looks confusing (smushed right up against the beginning of the value).

Bug: 64112446
Test: Update MediaViewTest
Change-Id: I463a9d37228756ec84654ecebbec9f4a4b9877a1