Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 6a1ebe1290

Change-Id: I6fd5b74682edfa5426e2217f0c8dee59c0a1edf6