Merge "Cleanup logic in KillZramBackingDevice" into rvc-dev am: aa0ec1a902

Change-Id: Ie5c192034658a62c759c0ec2a954fec14e9c5a37