Merge "Merge \\"Cache resources needed to sort media sizes.\\" into nyc-dev am: 142fc425c4 am: c6bddb8261" into nyc-mr1-dev-plus-aosp