Commits
Christine Hallstrom authored 2eb7d4761ee
Manual 'cherry pick' to fix CTS tests for MediaControllerTest. This is to manually apply a patch of code that should have propagated to E, but hasn't and is breaking one of the CTS tests for MediaControllerTest on Nemo. The original reverted change can be found at ag/723643. Bug: 24172957 Change-Id: I925ff561a56531ebf9f8d8b4ce56156ae7feb9fc