Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 6a1ebe1290 am: 53e4468013

Change-Id: I4a38fe6741dfa03271efc7abc48f62a0d3adb929