Merge "Rename KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL." am: 10f01e3c4c am: 32cdb7dcbb

Change-Id: Ifd8b93e4dca702afa60288a160eb6e09ce74bce4