Merge "MediaProvider: Add constants for media_table and media_id columns in MTP objects table"