Merge "PowerManagerService: Switch to using MountService shutdown for media"