Merge "Merge "Adding back media resumption" into rvc-dev am: ad80df94 am: af474e93 am: 4dac0226" into rvc-qpr-dev-plus-aosp