Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 10f01e3c4c

Change-Id: I5d69ec2f11680ef25b06cd1e1b6460dd4b1e8523